From 83d84118e59cc7bb3ec68274f621a16adf7c4e0e Mon Sep 17 00:00:00 2001 From: Isaku Yamahata Date: Mon, 25 Aug 2008 19:04:37 +0900 Subject: [PATCH] [IA64] move back pal.S into xen/arch/ia64/linux. Now xen/arch/ia64/linux-xen/pal.S is the same as arch/ia64/kernel/pal.S from linux 2.6.21. So move it back into xen/arch/ia64/linux. Signed-off-by: Isaku Yamahata --- xen/arch/ia64/linux-xen/Makefile | 1 - xen/arch/ia64/linux-xen/README.origin | 1 - xen/arch/ia64/linux/Makefile | 1 + xen/arch/ia64/linux/README.origin | 3 +++ xen/arch/ia64/{linux-xen => linux}/pal.S | 0 5 files changed, 4 insertions(+), 2 deletions(-) rename xen/arch/ia64/{linux-xen => linux}/pal.S (100%) diff --git a/xen/arch/ia64/linux-xen/Makefile b/xen/arch/ia64/linux-xen/Makefile index 64c66af498..8e1bb1c907 100644 --- a/xen/arch/ia64/linux-xen/Makefile +++ b/xen/arch/ia64/linux-xen/Makefile @@ -7,7 +7,6 @@ obj-y += irq_ia64.o obj-y += mca.o obj-y += mca_asm.o obj-y += mm_contig.o -obj-y += pal.o obj-y += process-linux-xen.o obj-y += sal.o obj-y += setup.o diff --git a/xen/arch/ia64/linux-xen/README.origin b/xen/arch/ia64/linux-xen/README.origin index 482a2ff79b..b4e4d1b32b 100644 --- a/xen/arch/ia64/linux-xen/README.origin +++ b/xen/arch/ia64/linux-xen/README.origin @@ -42,7 +42,6 @@ perfmon_montecito.h -> linux/arch/kernel/perfmon_montecito.h # The files below are from Linux-2.6.21 efi.c -> linux/arch/ia64/kernel/efi.c -pal.S -> linux/arch/ia64/kernel/pal.S # The files below are from Linux-2.6.26-rc5 acpi.c -> linux/arch/ia64/kernel/acpi.c diff --git a/xen/arch/ia64/linux/Makefile b/xen/arch/ia64/linux/Makefile index db279dcd3d..3358570ee1 100644 --- a/xen/arch/ia64/linux/Makefile +++ b/xen/arch/ia64/linux/Makefile @@ -15,6 +15,7 @@ obj-y += machvec.o obj-y += memcpy_mck.o obj-y += memset.o obj-y += numa.o +obj-y += pal.o obj-y += strlen.o obj-y += __divsi3.o diff --git a/xen/arch/ia64/linux/README.origin b/xen/arch/ia64/linux/README.origin index 31ab3e940e..05a6ba2f4e 100644 --- a/xen/arch/ia64/linux/README.origin +++ b/xen/arch/ia64/linux/README.origin @@ -29,3 +29,6 @@ carta_random.S -> linux/arch/ia64/lib/carta_random.S # The files below are from Linux-2.6.19 io.c -> linux/arch/ia64/lib/io.c + +# The files below are from Linux-2.6.21 +pal.S -> linux/arch/ia64/kernel/pal.S diff --git a/xen/arch/ia64/linux-xen/pal.S b/xen/arch/ia64/linux/pal.S similarity index 100% rename from xen/arch/ia64/linux-xen/pal.S rename to xen/arch/ia64/linux/pal.S -- 2.30.2